From: Linus Torvalds Date: Mon, 27 Dec 2010 18:25:02 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15894 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4e838c7e6ebaf7b2febaafe2cd598a44fdceb094;p=linux-4.9.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_cs5536: avoid implicit MSR API inclusion on x86-64 --- 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094